xmlgeneric: Check input file for unicode format.

diff --git a/xmlgeneric.c b/xmlgeneric.c
index 8fcbfc3d897431a03d985dcf043388a5c5c80a45..6f82f2261f9a9b7464242cee1fa6740284adf54b 100644 (file)
--- a/xmlgeneric.c
+++ b/xmlgeneric.c
@@ -267,11 +267,17 @@ void xml_read(void)
        char buf[MY_CBUF];
        
        while ((len = gbfread(buf, 1, sizeof(buf), ifd))) {
-               if (!XML_Parse(psr, buf, len, gbfeof(ifd))) {
+               char *str = buf;
+               if (ifd->unicode) {
+                       str = cet_str_uni_to_utf8((short *)&buf, len >> 1);
+                       len = strlen(str);
+               }
+               if (!XML_Parse(psr, str, len, gbfeof(ifd))) {
                        fatal(MYNAME ":Parse error at %d: %s\n",
                                (int) XML_GetCurrentLineNumber(psr),
                                XML_ErrorString(XML_GetErrorCode(psr)));
                }
+               if (str != buf) xfree(str);
        }
        XML_ParserFree(psr);
        
@@ -309,6 +315,7 @@ xml_init0(const char *fname, xg_tag_mapping *tbl, const char *encoding,
 {
        if (fname) {
                ifd = gbfopen(fname, "r", MYNAME);
+               (void) gbfunicode(ifd);
                if (offset) {
                        gbfseek(ifd, offset, SEEK_SET);
                }